improved start and stop