CFY-1025 better stop/start/restart