Make the example file do all the work - remove testing hack