merging eric's changes