Working on redraw bug. Downmerge