deleted some unnesessary funcs