change stuff
major edit