Changes to our main class