merged from greg