Reworking start and stop orders fixes #1 #2