Updated for 6.0.2