Added some funcs