merged all work till nw