Finished up changes to incorporate Geraint's cc stuff