UPDATE TO 1.6.2 and N.O.