Added code to check for note dates as well.