more 1.7 stuff