Surely this should be in the library and not the demo app?