bunch of changes I don't want to lose