better calculation of waiting time average