changes on the basis of demo