changes to main class