Added some important stuff