* Sync with haddock