updated for a UX focus