Added additional measures; game logic