Updates to function stuff