fixing bug, didn't properly update function calls