merge changes from steve glaser