changes for time window and...removing location