Updated with recent work