Adjustment for new gateway