Fixed the new user experience