merging in GLM specific changes