made some changes
finish demo app