reorganized public stuff