update changes for 1.2