The Rigaku “SmartLab” multi-diffractometer for X-ray diffraction on powders and thin-films has long been a crucial part of the CMC Aarhus DiffractometerLab. The “SmartLab” is the absolute Rolls Royce among powder/thin-film diffractometers world wide, exhibiting the very pinnacle of performance. As a result, the usage of the instrument has been steadily increasing. It has therefore been decided to further upgrade the “SmartLab” with a exiting-optics graphite multi-monochromator and an incident-optics beam focusing (CBO-f unit). The monochromator will effectively suppress sample fluorescence and incomplete monochromatization in the incident beam, leading to a dramatic improvement of data quality. The CBO-f optics will provide a huge flux increase while narrowing the beam size to 40 micron. This will yield much quicker data collection and broaden the capability of doing space-resolved (x/y) structural mapping of inhomogeneous samples.