3.2 to 4.0 + all clean