cleaned each to use fast model rendering classes