Added cross country scenario and added default case to switch statement