Optimized drawing code for better performance.
Optimized drawing code for better performance.
merged?