changed fnc names