Integrated Chris's stuff