Initial commit of 3.0