Added multi-round support for non-DHooks switching.