Batch draw now used - Needs optimization