Major CPU usage improvement