Changes based upon Christina's review