Big speed improvement to file loading for large files