Last Change before perfect game refactor