Updpated run_first