         showIndicator()
         var signal: ColdSignal<PaginatedEntryCollection>
         if let id = stream?.id {
-            signal = client.fetchEntries(streamId:id, continuation: streamContinuation, unreadOnly: unreadOnly)
+            signal = feedlyClient.fetchEntries(streamId:id, continuation: streamContinuation, unreadOnly: unreadOnly)
         } else {
             let appDelegate = UIApplication.sharedApplication().delegate as AppDelegate
             let sampleFeeds  = appDelegate.sampleFeeds
             if currentIndex < sampleFeeds.count {
-                signal = client.fetchEntries(streamId: sampleFeeds[currentIndex], continuation: nil, unreadOnly: unreadOnly)
+                signal = feedlyClient.fetchEntries(streamId: sampleFeeds[currentIndex], continuation: nil, unreadOnly: unreadOnly)
                 currentIndex += 1
             } else {
                 self.hideIndicator()


    func markAsSaved(indexPath: NSIndexPath) {
        let entry = entries[indexPath.item]
        if self.client.isLoggedIn {
            let client = FeedlyAPIClient.sharedInstance.client
            client.markEntriesAsSaved([entry.id], completionHandler: { (req, res, error) -> Void in
                if let e = error { println("Failed to mark as saved") }
                else             { println("Succeeded in marking as saved") }
            })
            client.markEntriesAsRead([entry.id], completionHandler: { (req, res, error) -> Void in
                if let e = error { println("Failed to mark as read") }
                else             { println("Succeeded in marking as read") }
            })

                    if let dic = error.userInfo as NSDictionary? {
                        if let response:NSHTTPURLResponse = dic[key] as? NSHTTPURLResponse {
                            if response.statusCode == 401 {
                                self.feedlyClient.clearAllAccount()
                                //TODO: Alert Dialog with login link
                            } else {
                            }
