fixup intermediate changes to alm bridge (still wip)