Changes to keep only Haskell code here