major performance improvement and qualifier support