changes in light of @andrewjstone comments