Attempting to improve UX.