added hotplug control