moved everything into "public"