push through changes suggested by @mjbrender