Using Georges Giroux's changes in the example.