updated function names and returns