Updated to 6.0.0