About to merge again.
Updated version.