modified callout logic