adjustments for 2.0