Slightly updated user experience.