finish demo app
fix