some changes to the demo