Committing to resolve issue 70