p s adding and including inside the with no further comment was exactly the right solution imho