Updating to master as per requirement

In final app file