Changes for 7.0