Much more changes to functor_ck