Complete overhaul of lock assertion mechanism