Adding major performance improvement