added breaks in switch