A bunch of changes made