Added in date checking