Changes for 4.0