Removed case for stop, not really needed