Made some changes to support the demo