Updating core game logic to comply with specification