added better breaking