changeset for #8. see if this is what we want