merged with thorsten