Work on comments from Honza