draw_weekly restructured