merge new stuff from greg