Incorporate feedback from Angela and Sean