Batch calls fixed to draw player
merge