Code updates for 8/14 run