UPDATE TO 1.8