Made a few slight changes