added breaks to switch