support another version that lets you set the reason.

Also changing the locator to be bit more robust in case more buttons get added here)
Improving the diagnostics