Add infor windows, solve the closure problem