comments improved, added locker protection