Finishing up changes Peter started