Added Pontus Ullgren's re-hash of Tyler's re-write of my code to de-fang