updated to reflect func changes