adjusted the main class