Updated custom lock device based on latest z-lock release