Changes to support multiple players