merge in glenn's changes