commit christoph changes