Improvements to consider