Changes from Rich

Couple changes