Changes to integrate the design units into the sample applications