Tried to make a bunch of changes