New changes (11/31)

New changes