Finish demo app round 2