Updated new no-db demo