code review changes and add code for braking cantalons