Added cheats and refactor