All teams now draw properly