More 1.7 work