Preparing for version 3