Some adjustments for TAP5-2230