more updates for 3.0