Added location based selector
Added draw_avg