Readjusted switch statemments