added more of the important stuff