small changes in main class