Adding generate windows