now using get_current_user instead of homemade methods