Updated to show user values