updated for Buffered Basic Shapes