Added updated functions