Update start/stop function for #466