added some ideas around Autolock