Adjust time window and add specs