Adding v3.0 to my branch