CHANGED:minor modification on switch opponent handlers;