Change To calculating dates on the fly