Final Changes for 3.0