Better Version, More Compliant, Actually Works
Simple changes