update for Unified API bugfix

lots more Unified work to do!