Made pretty much all the changes from vickie on Nov 4