adding bunch of changes that i lost track of lol