Basic upgrade to 2.0