changes suggested by Nathan Kurz