adding window change support