Added some new funcitons