Upgrading to v2.1

Things to consider when making the the move