D2 dev

Had to make some important fixes