Added breaks to some cases