Now supports partial draw listings