Make demonstration better