diff --git a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib
index f99a12937..1eddd81b9 100644
Binary files a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib and b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib differ
diff --git a/macosx/PiecesView.m b/macosx/PiecesView.m
index 2ee216144..4c9838db8 100644
--- a/macosx/PiecesView.m
+++ b/macosx/PiecesView.m
@@ -202,16 +202,27 @@
         [fImageView setImage: [[fBack copy] autorelease]];
     NSImage * image = [fImageView image];
 
-    int8_t * pieces = malloc(fNumPieces);
+    int8_t * pieces;
+    float * piecesPercent;
     
     BOOL showAvailablity = [[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"];
-    
     if (showAvailablity)
+    {   
+        pieces = malloc(fNumPieces);
         [fTorrent getAvailability: pieces size: fNumPieces];
+    }
     else
-        [fTorrent getAmountFinished: pieces size: fNumPieces];
+    {   
+        piecesPercent = malloc(fNumPieces * sizeof(float));
+        [fTorrent getAmountFinished: piecesPercent size: fNumPieces];
+        
+        int i;
+        for (i = 0; i < fNumPieces; i++)
+            NSLog(@"%f", piecesPercent[i]);
+    }
     
     int i, j, piece, index = -1;
+    float piecePercent;
     NSPoint point;
     NSRect rect = NSMakeRect(0, 0, fWidth, fWidth);
     NSImage * pieceImage;
@@ -228,10 +239,10 @@
             }
             
             pieceImage = nil;
-            piece = pieces[index];
             
             if (showAvailablity)
             {
+                piece = pieces[index];
                 if (piece < 0)
                 {
                     if (first || fPieces[index] == -2)
@@ -281,6 +292,7 @@
             }
             else
             {
+                piecePercent = piecesPercent[index];
                 /*if (i==0)
                     pieceImage = fBlue1Piece;
                 else if (i==1)
@@ -292,7 +304,7 @@
                 else if (i==4)
                     pieceImage = fBluePiece;
                 
-                else */if (piece <= 0)
+                else */if (piecePercent <= 0.0)
                 {
                     if (first || fPieces[index] != 0)
                     {
@@ -300,7 +312,7 @@
                         pieceImage = fWhitePiece;
                     }
                 }
-                else if (piece < 25)
+                else if (piecePercent < 0.25)
                 {
                     if (first || fPieces[index] != 1)
                     {
@@ -308,7 +320,7 @@
                         pieceImage = fBlue1Piece;
                     }
                 }
-                else if (piece < 50)
+                else if (piecePercent < 0.50)
                 {
                     if (first || fPieces[index] != 2)
                     {
@@ -316,7 +328,7 @@
                         pieceImage = fBlue2Piece;
                     }
                 }
-                else if (piece < 75)
+                else if (piecePercent < 0.75)
                 {
                     if (first || fPieces[index] != 3)
                     {
@@ -324,7 +336,7 @@
                         pieceImage = fBlue3Piece;
                     }
                 }
-                else if (piece < 100)
+                else if (piecePercent < 1.0)
                 {
                     if (first || fPieces[index] != 4)
                     {
@@ -363,7 +375,19 @@
         [fImageView setNeedsDisplay];
     }
     
-    free(pieces);
+    if (showAvailablity)
+        free(pieces);
+    else
+        free(piecesPercent);
 }
 
+/*- (void) toggleView: (id) sender
+{
+    NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults];
+    [defaults setBool: ![defaults boolForKey: @"PiecesViewShowAvailability"]
+                forKey: @"PiecesViewShowAvailability"];
+    
+    [self updateView: YES];
+}*/
+
 @end
diff --git a/macosx/Torrent.h b/macosx/Torrent.h
index 068a96d68..f578b3f5d 100644
--- a/macosx/Torrent.h
+++ b/macosx/Torrent.h
@@ -66,7 +66,7 @@
 - (NSString *) downloadFolder;
 
 - (void) getAvailability: (int8_t *) tab size: (int) size;
-- (void) getAmountFinished: (int8_t *) tab size: (int) size;
+- (void) getAmountFinished: (float *) tab size: (int) size;
 
 - (void)            update;
 - (NSDictionary *)  infoForCurrentView;
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index cce5b0e94..0c8e07a7a 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -164,7 +164,7 @@ static uint32_t kRed   = BE(0xFF6450FF), //255, 100, 80
     tr_torrentAvailability(fHandle, tab, size);
 }
 
-- (void) getAmountFinished: (int8_t *) tab size: (int) size
+- (void) getAmountFinished: (float *) tab size: (int) size
 {
     tr_torrentAmountFinished(fHandle, tab, size);
 }