add stuff from christoph