Added in the required break if complete and tidied up the next