Updated to 3.0