Fixed minor changes and added d2d