Implemented some more CFA steps