Changes for 1.1