Added some funcs and Comments