Improve Demo in order to use 2 arguments