Started changes relevant to 3.0