incorporate changes from gdoc