Adjustments for patch 3