Make it more memory friendly