Updated to 6.0