Adding comments from Fabian.