#81 move the lock wait time to the wait method