Improvement on last commit