default goal date logic added