changed classes to public