Added a few slight changes