change where from fun to macro