Added some new functions