updating the master with october 17