made some changes on feature_demo1 branch