Adding comments from Andrew and Jan