In the past, Microsoft and IBM have worked to add collaboration facilities to their existing architectures.[24] Although marketed as real-time collaboration, these 'workspace' approaches require either document locking (so only one person can edit it at a time), or 'reconciliation' of conflicting changes, which is generally found by users to be unsatisfactory.[citation needed]