some changes for breakes