More 1.7 stuff