New changes (9/31)

New changes