finish preparing for version 2