changes from the demo