Update for the new haskell code