Sorting fixed, commented out mfl and fs