Created new functions and am changing calls