edited notes and entities to reflect ui scenarios