Made the last change optional