Some ideas and demonstration improvement