Update to reflect recent work