Change funcs to vars