Added some new fns