         
         // point takes preference
         if let validPoint = point {
-            isScrollInProgress = true
             scrollTo(point: validPoint,
                      triggerScrollToDateDelegate: triggerScrollToDateDelegate,
                      isAnimationEnabled: isAnimationEnabled,

                         completionHandler: completionHandler)
            }
        }
        
        // Jt101 put this into a function to reduce code between
        // this and the scroll to header function
        if !isAnimationEnabled {
            self.scrollViewDidEndScrollingAnimation(self)
        }
        self.isScrollInProgress = false
    }
    
    func scrollTo(point: CGPoint, triggerScrollToDateDelegate: Bool? = nil, isAnimationEnabled: Bool, extraAddedOffset: CGFloat, completionHandler: (() -> Void)?) {

        isScrollInProgress = true
        var point = point
        if scrollDirection == .horizontal { point.x += extraAddedOffset } else { point.y += extraAddedOffset }
        DispatchQueue.main.async {
            self.setContentOffset(point, animated: isAnimationEnabled)
            self.isScrollInProgress = false
        }
    }
    
    func scrollTo(rect: CGRect,
