further changes
finish demo app