improve last commit a bit