implementing Kris's suggested revisions