Added rest of flat fields