Further small control unit optimization