Gateway-3389 Refactored for passthrough

Refactored so standard does not call passthrough.