Function names changed - final commit