updated 2.0 and 3.0 plans