Updated for 3.0.6