A few changes to make the example work