Updated some of the functions.