update to remove mutating windows in has next and do so in next