[#2] Optimize drawing