Made a few additions