Added a bunch of changes