Preparing for version 2