Added D12 and D30