Changes for 6.1