Updated wrt. Henriks comments