Autolock feature added