ASAG updated, to be tested
CFModel modified