added switch statements but Its not working so commented out