And refactor to not cheat