Made changes to finalize the migration to GameController