Continued work on new version.