folding in Erik's suggestions