add STOP support