Updated for gordian changes.