Added return for stop