re-add eric's changes