Mostly done with more recent work