Preparing for 2.0