Version 2.0 Adjustments