Change all the things
More improvements