incremental; added trusted_client - yet untested