adding stop support