wrapping up changes before hiatus