New changes (12/31)

New changes