Revert "Revert "version 3""

This reverts commit dbc0b4ddba89601205622a70f7e0e2255c91bc16.