more changes to main class