further updates for 3.0