Modified App main.