Improvements on the latest commit