more updates to new QFCS model