Further work on no latch version