Note improvements to make