Improve on the previous commit