Made some changes for demo