Toward a simultaneous description of R-AA and v(2) for heavy quarks