edited locker situation in game