added stopping stuff