Adding in changes Chris made