Changes from Loretta's comments