Added a few new functions