This is just a second round of the previous series, cleaned up the problems pointed out (except property hotplug - bigger problem), Dave.