Diamond Suite Upgrade