Upgraded to 2.0, more major changes