Imported changes from making condition 4 run.