formatting and adding Haddock and Dunn