adding current user and more