Final merge with Richard’s / Marcel’s code.