Reverted backend to oroginal demo code