adding checks for re_current_user ...