removed some outsourced code. updated the GameManager