Improvements to last commit