now with lock system