ADD: only include normal windows