UPDATE TO 1.6