Changed Main method