add DI related objects
add DD related objects
2D update
updates n small fixes