Modified main method again