Changed main()