+in-progress 3.7 work