"merge in some working changes"