Added Nodes & Fixed DGW