Again finish demo app