MM: further work on Cucumber