Upgrade to debug 2.0