CHANGE: Improve performance of last change