More pleased with this version now.