incorporating Will's work