added breaks that got removed wrongly