Include proper calculation of Date -> GA day