updated window, needs to be tested