refactored game resolution