Added after hours and daytype calculations.