Changes for 1.5