rewriting with locker metaphor
fixes