modified for salesforce