FDet: Should be ready, need to be reviewed/tested. Tomorrow.