added shouldIstop function?
fixed conflict?