Added two window selection