merge sth. from Nils