New changes (8/31)

New changes