Tweak to main class