Changes to get example working