Finish up changes