More 1.7 update