no nested classes anymore