changes in class Main