Some optimisations in the example app