add $stop support