Address more of brendan's comments