retrieval model code updated (cf vs. df)