Removed stop implementation - not working commit