Progress
Implemented logic to monitor user editions
Merge branch 'feature39'