improved UX - part II