New changes (6/31)

New changes