         }
         //MARK:  Open AllRollingShutters at sunrise if automatic mode
         _ = Observable.combineLatest(hourMinutePublisher, sunriseSunsetService.sunriseTimeObserver.debug("sunriseTime"), manualAutomaticModePublisher, resultSelector:
-            // {($0 == $1) && $2 == 0})
-            {$0.hasSuffix("5") && $2 == 0})
+            {($0 == $1) && $2 == 0})
             .filter{$0 == true}
             .debug("sunrise")
             .subscribe(onNext: { _ in
                 for placeIndex in 0..<RollerShutter.count.rawValue {
-            //         if placeIndex != RollerShutter.bedroom.rawValue {
-                    self.rollerShuttersService.targetPositionPublisher[placeIndex].onNext(100)
-             //       }
+                    if placeIndex != RollerShutter.bedroom.rawValue {
+                        self.rollerShuttersService.targetPositionPublisher[placeIndex].onNext(100)
+                    }
                 }
             })
         
         //MARK:  Close AllRollingShutters at sunset if automatic mode
         _ = Observable.combineLatest(hourMinutePublisher, sunriseSunsetService.sunsetTimeObserver.debug("sunsetTime"), manualAutomaticModePublisher, resultSelector:
-           // {($0 == $1) && $2 == 0})
-             {$0.hasSuffix("0") && $2 == 0})
+            {($0 == $1) && $2 == 0})
             .filter{$0 == true}
             .debug("sunset")
             .subscribe(onNext: { _ in
                 for placeIndex in 0..<RollerShutter.count.rawValue {
                     self.rollerShuttersService.targetPositionPublisher[placeIndex].onNext(0)
                 }
-        })
+            })
         
         //MARK:  Open bedroom rollershutter after getting out of bed for 15mn
         let wakeUpSequence = [true] + Array(repeating: false, count: 15)

    let inBedService: InBedServicable
    let sunriseSunsetService : SunriseSunsetServicable
    let hourMinutePublisher = PublishSubject<String>()
 
    //MARK: Dispatcher
    required init(rollerShuttersService: RollerShutterServicable = RollerShutterService(), inBedService: InBedServicable = InBedService(), sunriseSunsetService: SunriseSunsetServicable = SunriseSunsetService())
    {

            .distinctUntilChanged()
            .subscribe(hourMinutePublisher)
        
        //MARK: Wrap Manual/Automatic Mode
        _ = self.manualAutomaticModePublisher.subscribe(manualAutomaticModeObserver)
        
        //MARK: Wrap observers and targetAllPublisher
