Improvements to future