New changes (7/31)

New changes