improve user flow etc