Added main class back