comments changed for haddock