Modified console app