2.1 + minor changes for 2.0