update code to build on master