improving stop functionality.