Improvements in start / stop