Modified batch draws a bit, still not fixed