Add d2 and jf stuff....

Removed duplicate