modified to show username