Re-commit of my updates.