Some changes in main class