UPDATE TO 1.7