merged Glen’s changes