Updated to 1.6 (that took to long  XD)