Added updateLock check