Updated to reflect new functions