DSI phase 3

Code Review