Made a few changes to demo2