Changes to main class