Commented all the new functions in App class