Changed window references