update: Added unnecessary breaks functionality