Modification from meeting with UX team October 23th.