Fixing cutoff calculation
Fixed cutoff place logic and testing with data