Update with comments from Thales