Added W3D3 work -- Alvin