* merged from Chrisitan Perrier