revised window selection section