added 6 and 7 (Haskell)