Added erocs suggestions, also replaced break with continue