Further version.
Fixed merge conflicts.