ID locking added

Talk about too many line changes.