Create Revised Switch Statement