updated function names throughout