Added stops (not tested)