Changes that we made in the demo!!!