Addesses comments from HO