Updated Window functions