Getting the A2D refined

Tweaking the A2D