Initial commit for version II