redo changes I did actually want...