Re-Add short & long locked time handling