Update with lr1 branch