added disabling for shape pieces and shape containers