Adjust to GW changes