Updated the main class