More updates... not sure if it actually improves perf though :P