Made some changes to demo