some changes for breaks