addressed more of liam's comments