uncommented some important stuff