Worked on main class