Large update for CFS, not even going to bother with a comment