re-commit of my changes; lost in the merge