Added some more fns