UPDATE TO 1.2