More refinements!
More haskell!
minor change ... still not working ...