Changes for 7.1