1.7 down to only 2 files with errors