updates from eric's changes