Modified main class