removed non important stuff from this branch