Updated manager with Draw features