Added 'stop' feature'