Updated for 3.0