Should keep fns indexed now