minor revision - content-drawing was optimized