Complete change (10/31)

Complete change