Updated with new functions\!