changes to run_RAE and few others