Changes based on Garrett comments