New changes (10/31)

New changes