Unify d2

Signed-off-by: John Hany <johnhany97@gmail.com>