Removed the lock feature and added comments in headers