more changes to be made in the switch