Interpretor and haddock added