Final code for working demo

This commit contains the changes that were made in order to have the
demo be successful.