Improve last change