Reduced the number of calls to getSoonestDate() again