Commiting 11/28 changes