Initial commit for new version 3.x