Modified main()