modify for 3.0