Hi, Over my time spent in XWiki I have had several discussions with Sergiu, Marta, Marius, Eduard about making the editing process more collaborative and rewarding for the contributors. I finally made a proposal that encapsulated the following use cases: - UC1: *Concurrent Editing * - Allow multiple users to edit a page at the same time with local versions and propose to merge any eventual conflicts after pressing save - UC2: *Viewing History Versions* - When viewing the page history, be able to distinguish also the magnitude of the contribution brought by the version - UC3: *Viewing History Statistics* - Be able to quickly scan how the content changed over time, how much content each contributor invested and each contributor's role (editor, commentator, attacher) - UC4: *Viewing History Content Overview* - Be able to blame someone for a certain portion of the content and also visually scan the contribution's magnitude of each contributor Although the discussions also contained more elaborate/fun topics (like reputation mechanisms for contributors, achievements, etc.) this proposal covers just the mentioned use cases. You can view the proposal at: http://incubator.myxwiki.org/xwiki/bin/view/Improvements/CollaborativeEditin... Feedback or other suggestion that match the purpose ("By rewarding participation, the contributors will feel appreciated and will want to contribute more.") of this proposal are welcomed. Thanks, Caty