Added cost and day logic