Update to faster Main demo