diff --git a/FRP/FRPPhotoViewController.m b/FRP/FRPPhotoViewController.m
index da5f208..5f5ab33 100644
--- a/FRP/FRPPhotoViewController.m
+++ b/FRP/FRPPhotoViewController.m
@@ -47,13 +47,15 @@
     
     // Configure subviews
     UIImageView *imageView = [[UIImageView alloc] initWithFrame:self.view.bounds];
-    RAC(imageView, image) = self.viewModel.photoImageSignal;
+    RAC(imageView, image) = RACObserve(self.viewModel, photoImage);
     imageView.contentMode = UIViewContentModeScaleAspectFit;
     [self.view addSubview:imageView];
     self.imageView = imageView;
 
-    [SVProgressHUD show];
-    [[self.viewModel.didBecomeActiveSignal take:1] subscribeNext:^(id x) {
+    [[self.viewModel.didBecomeActiveSignal take:1] subscribeCompleted:^{
+        [SVProgressHUD show];
+    }];
+    [RACObserve(self.viewModel, photoImage) subscribeNext:^(id _){
         [SVProgressHUD dismiss];
     }];
 }
diff --git a/FRP/FRPPhotoViewModel.h b/FRP/FRPPhotoViewModel.h
index d2180be..0b94b4c 100644
--- a/FRP/FRPPhotoViewModel.h
+++ b/FRP/FRPPhotoViewModel.h
@@ -14,7 +14,7 @@
 
 @property (nonatomic, readonly) FRPPhotoModel *model;
 
-@property (nonatomic, readonly) RACSignal *photoImageSignal;
+@property (nonatomic, readonly) UIImage *photoImage;
 
 -(NSString *)photoName;
 
diff --git a/FRP/FRPPhotoViewModel.m b/FRP/FRPPhotoViewModel.m
index 53bba58..02ed552 100644
--- a/FRP/FRPPhotoViewModel.m
+++ b/FRP/FRPPhotoViewModel.m
@@ -14,7 +14,7 @@
 
 @interface FRPPhotoViewModel ()
 
-@property (nonatomic, strong) RACSignal *photoImageSignal;
+@property (nonatomic, strong) UIImage *photoImage;
 
 @end
 
@@ -34,7 +34,7 @@
         }];
     }];
     
-    self.photoImageSignal = [RACObserve(self.model, fullsizedData) map:^id(id value) {
+    RAC(self, photoImage) = [RACObserve(self.model, fullsizedData) map:^id(id value) {
         return [UIImage imageWithData:value];
     }];