improvments to last change