Update with recent work