keep up with LockWait changes