changed comments to include email instead of user_name