I changed to an 18-inch mechanical flex fan, Milodon high-flow water pump, 160 high-flow thermostat, and a stock-style shroud. I had to trim the shroud a bit to get it to fit on my aluminum radiator, but it has tons of airflow now and runs very cool.