additionaly changes regarding timeWithinRange