Improved UserFlow