Part way through switching to LR only implementation