Minor changes to STOP fn