Modify the change function--get rid of redundancies