Updated for 6.0.3
Updated for 6.0.3