Updated window models