Removed 2 funcs