Improved the last commit