dramatic speed improvement. 0.2.0 version with syntax changes