Updated stop functionality