More funcs added