p970: Updated for 11.0