Changed to proper main class