added second commit from eric's branch