removed 2nd stop func