Changed main method