Haddock edit