Added some more slight changes