Retrofitting for the Future and Fixing the Bad Air Mixing