ref #15 major performance boost