cc
some more reorginization