Added window remapping