did so in my 3d-refactor branch