Reorganized for generic device.