Yes possibly. I think we need to also measure for performance and refactor based on what we find. (Not changed).