Jaideep/Shripad Done with the sample app