Modified main, and app modules.