Addressed Haralds review comments.