Changes to haskell interface requested by Greg