Working map redraw!!