Added window swap