merging with thorsten