More work towards the new version.