Improve run mode