added disable feature unless stop was chosen