changes to fix fai-cds