minor reorg of latch