Updated selection
added aggregation window