Some changed to fluids. This is NOT A3.1 that has some lines commented out.