time window structures improvements