Improved ux ;)