added changes from december 12