Final version, actually used in the fes