Added D3 and Aaron's stuff