bunch of changes, big shit