Modify for 3.0 and later