[FIX] Performance update. No need for doulbe loop