changes up to 12/17