Improved stop capability