adjusted the main class..