updates for compatibility with matterhorn