get rid of "fun" pointer