removed two break statements