Again, huge amount of updating for 1.7