Made some small alterations