Add calculation of window times