FAFS modifications