Replicated changes made to demo app.