merging changes from last gdw