Addressing various comments from directorates.