Added more funcs