a bunch of changes made