Make some changes in demo project