Added updated main app file