Reverting right back to 2.0.9 and making minor changes learned from previous versions