Tentative Lock changes