Updated to include new functions