updated 12-6-2018