new version with levoy methods, clarified tracking and more diderot code