Efficiency enhancements & diff file by file