Documentation of the new code, some garbage deleted.