Window refactor and ChangeWrapper