Adding changes to the main class