changes to comply with notes from Abe
Utter's updates.