A lot of comments to infrastructure