     //  columnCount
     //----------------------------------
 
-    private var explicitColumnCount:int = -1;
     private var _columnCount:int = -1;
 
     [Bindable("propertyChange")]
     [Inspectable(category="General")]
 
     /**
-     *  Number of columns to be displayed.
      *  This property will contain the actual column count after
      *  <code>updateDisplayList()</code>.
+     *
+     *  @see #rowCount
+     *  @see #columnAlign
+     *  @default -1
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10
+     *  @playerversion AIR 1.5
+     *  @productversion Flex 4
+     */
+    public function get columnCount():int
+    {
+        return _columnCount;
+    }
+
+    //----------------------------------
+    //  requestedColumnCount
+    //----------------------------------
+
+    /**
+     *  @private
+     *  Storage for the requestedColumnCount property.
+     */
+    private var _requestedColumnCount:int = -1;
+    
+    [Inspectable(category="General")]
+
+    /**
+     *  Number of columns to be displayed.
+     *  Set to make sure the layout measures a specific number of columns.
+     * 
      *  Set to -1 to remove explicit override and allow the TileLayout to determine
      *  the column count automatically.
      *
      *  Setting this property won't have any effect, if <code>orientation</code> is
      *  set to TileOrientation.ROWS, <code>rowCount</code> is explicitly set, and the
      *  container width is explicitly set.
-     *
-     *  @see #rowCount
-     *  @see #justifyColumns
+     * 
+     *  @see #columnCount
+     *  @see #columnAlign
      *  @default -1
      *  
      *  @langversion 3.0

     *  justification, but just determines the initial gap value, and after thatn justification
     *  may increases it.</p>
     *
     *  <p>When set to <code>TileJustifyColumns.COLUMN_SIZE</code> - the <code>columnWidth</code>
     *  actual value will increase so that
     *  the last fully visible column right edge aligns with the container's right edge.  Note that
     *  explicitly setting the <code>columnWidth</code> does not turn off justification, but simply

     *  @playerversion AIR 1.5
     *  @productversion Flex 4
     */
    public function get requestedColumnCount():int
    {
        return _requestedColumnCount;
    }

    /**
     *  @private
     */
    public function set requestedColumnCount(value:int):void
    {
        if (_requestedColumnCount == value)
            return;
                               
        _requestedColumnCount = value;
        _columnCount = value;
        invalidateTargetSizeAndDisplayList();
    }    

    //----------------------------------
    //  rowCount
