Wrapping up changes for now