some updates for 4.0