Added more haddock's