Renamed group_lock to tuple_lock
Minor updates to locking