Fixed nre & cpu usage