Updated to comply with main class.