added stuff in main class