Changed the way demos is run
Removed default parameter values