in preparation for Orchid integration