modified code to pass the build