Added break logic