unfinished lock_store changes