CFY-3 start extracting common stuff