Updates to functions