some minor changes in order to make the project usable as a demo