             self.downloadButton.hidden = true
         }
         nc.addObserverForName(VideoStoreFinishedDownloadNotification, object: nil, queue: NSOperationQueue.mainQueue()) { note in
-            if self.session.hd_url == nil {
-                return
-            }
-            
-            if let url = note.object as? String {
-                if url != self.session.hd_url! {
-                    return
-                }
-            } else {
+            if !self.isThisNotificationForMe(note) {
                 return
             }
             

        }
    }
    
    @IBAction func download(sender: NSButton) {
        if let url = session.hd_url {
            VideoStore.SharedStore().download(url)

            self.downloadFinishedCallback()
        }
        nc.addObserverForName(VideoStoreDownloadProgressedNotification, object: nil, queue: NSOperationQueue.mainQueue()) { note in
            if !self.isThisNotificationForMe(note) {
                return
            }
            
