Some changes for 1.2