Updated changes from mid-November