Ready to merge - Implemented locks