upgrades for compatibility with matterhorn