Initial commit of the second version