Making the demo keeps working