more changes to final initial version.