Main class adjusted