updated stop behaviour