Add wind data and improve delay data