#496 - Update start/stop function