Updated for 6.0