Prepare version 2.0