- added logic for gmae selection