3.2 Final Changes