aug15_fixups edit