Updated game class logic