new internal architecture