Updated for new game