Hopefully improved start/stop logic
Updated changes