Stop improvements