Got rid of change buffer