Final preparations for 2.0